Don't eat Ctrl-PageUp/PageDown. (#318670, Christian Neumair)

2005-10-27  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat
	Ctrl-PageUp/PageDown.  (#318670, Christian Neumair)

diff --git a/ChangeLog b/ChangeLog
index b3e234c60cb36ecc3deb7c32308cf636036b58db..090bd349bf1b81930ef93d87f12b2d1593964cd7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat
+       Ctrl-PageUp/PageDown.  (#318670, Christian Neumair)
+
        * demos/gtk-demo/clipboard.c (paste_received): Only set the
        text if it is not NULL.  (#319930, Thomas Klausner)
 
@@ -29,7 +32,7 @@
        glib-mkenums.  (#318582, Damien Carbery)
 
        * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify
-       docs.  (#317682, Christian - Manny Calavera - Neumair)
+       docs.  (#317682, Christian Neumair)
 
        * gdk/x11/gdkdnd-x11.c: Remove an extra const which doesn't
        seem to affect the placement of the data in the readonly 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b3e234c60cb36ecc3deb7c32308cf636036b58db..090bd349bf1b81930ef93d87f12b2d1593964cd7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-10-27  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkcombobox.c (gtk_combo_box_key_press): Don't eat
+       Ctrl-PageUp/PageDown.  (#318670, Christian Neumair)
+
        * demos/gtk-demo/clipboard.c (paste_received): Only set the
        text if it is not NULL.  (#319930, Thomas Klausner)
 
@@ -29,7 +32,7 @@
        glib-mkenums.  (#318582, Damien Carbery)
 
        * gtk/gtktreemodel.c (gtk_tree_model_rows_reordered): Clarify
-       docs.  (#317682, Christian - Manny Calavera - Neumair)
+       docs.  (#317682, Christian Neumair)
 
        * gdk/x11/gdkdnd-x11.c: Remove an extra const which doesn't
        seem to affect the placement of the data in the readonly 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f6a6a227710cb649747093c6f3db3e7edaf503bf..d6ae05a40b3bf4edcae20cd0b3a7f3a49c284e84 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3492,6 +3492,9 @@ gtk_combo_box_key_press (GtkWidget   *widget,
       return TRUE;
     }
 
+  if (state != 0)
+    return FALSE;
+
   switch (event->keyval) 
     {
     case GDK_Down: